Documentation improvements. (gtk_style_detach): Assert that the

2005-10-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstyle.c (gtk_style_detach):
	(gtk_style_attach):  Documentation improvements.
	(gtk_style_detach): Assert that the attach_count is > 0.

diff --git a/ChangeLog b/ChangeLog
index c113af9833d32b990e73be634a05acf207090bb4..88ef5e008932e0e900d74c22c992b961e821bce3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstyle.c (gtk_style_detach):
+       (gtk_style_attach):  Documentation improvements.
+       (gtk_style_detach): Assert that the attach_count is > 0.
+
 2005-10-04  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (switch_to_shortcut): Take a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c113af9833d32b990e73be634a05acf207090bb4..88ef5e008932e0e900d74c22c992b961e821bce3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstyle.c (gtk_style_detach):
+       (gtk_style_attach):  Documentation improvements.
+       (gtk_style_detach): Assert that the attach_count is > 0.
+
 2005-10-04  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (switch_to_shortcut): Take a

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 44a65730801debf686aa7c2500caeb5a49742251..8df20d2c8ed7027e063dc2e9db46ae360f1f630c 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -716,6 +716,10 @@ gtk_style_new (void)
  * it to a particular visual and colormap. The process may 
  * involve the creation of a new style if the style has already 
  * been attached to a window with a different style and colormap.
+ *
+ * Since this function may return a new object, you have to use it 
+ * in the following way: 
+ * <literal>style = gtk_style_attach (style, window)</literal>
  **/
 GtkStyle*
 gtk_style_attach (GtkStyle  *style,
@@ -792,10 +796,19 @@ gtk_style_attach (GtkStyle  *style,
   return new_style;
 }
 
+/**
+ * gtk_style_detach:
+ * @style: a #GtkStyle
+ *
+ * Detaches a style from a window. If the style is not attached
+ * to any windows anymore, it is unrealized. See gtk_style_attach().
+ * 
+ */
 void
 gtk_style_detach (GtkStyle *style)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (style->attach_count > 0);
   
   style->attach_count -= 1;
   if (style->attach_count == 0)